From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 25 Nov 2010 16:34:34 +0000 (+0100)
Subject: Fix use standard License keyword Expat for main code (but leave as-is for Debian... 
X-Git-Tag: archive/raspbian/2.5.1+ds-1+rpi1~1^2~372
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=448ac0366438bd14957603f39ed8e5e1b4997498;p=jacktrip.git

Fix use standard License keyword Expat for main code (but leave as-is for Debian part: let IOhannes change himself), and rewrap licensing text at 72 chars.
---

diff --git a/debian/copyright b/debian/copyright
index eb1db46..cb27453 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,12 @@ Maintainer: IOhannes m zmölnig
 Source: http://code.google.com/p/jacktrip/
 
 Copyright: 2008, Juan-Pablo Caceres, Chris Chafe
-License: MIT/X11 (BSD like)
+License: Expat
 
 Files: ./debian/*
 Copyright: 2010, IOhannes m zmoelnig
 License: MIT/X11 (BSD like)
+ FIXME
 
 Files: ./documentation/img/qjackctl.png
 	./documentation/img/jack_main_settings.jpg
@@ -16,26 +17,22 @@ Files: ./documentation/img/qjackctl.png
 License: UNKNOWN
  FIXME
 
-
-License: MIT/X11 (BSD like)
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
  .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
  .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
- 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.